From 633631a47b9a78855965f19b6050ca6e1616d6d8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 29 Nov 2016 11:32:45 +0100 Subject: [PATCH] cssgadget: Compute relative to own allocation, not widget allocation This would lead to clipped gadgets when the gadget allocation differed from the widget allocation, like in GtkListBox. --- gtk/gtkcssgadget.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gtk/gtkcssgadget.c b/gtk/gtkcssgadget.c index 64b35063f1..85a2d7fa21 100644 --- a/gtk/gtkcssgadget.c +++ b/gtk/gtkcssgadget.c @@ -127,21 +127,9 @@ gtk_css_gadget_get_clip (GtkCssGadget *gadget, { GtkCssGadgetPrivate *priv = gtk_css_gadget_get_instance_private (gadget); - if (priv->owner && !gtk_widget_get_has_window (priv->owner)) - { - GtkAllocation widget_alloc; - gtk_widget_get_allocation (priv->owner, &widget_alloc); - - graphene_rect_init (bounds, - priv->clip.x - widget_alloc.x, priv->clip.y - widget_alloc.y, - priv->clip.width, priv->clip.height); - } - else - { - graphene_rect_init (bounds, - priv->clip.x, priv->clip.y, - priv->clip.width, priv->clip.height); - } + graphene_rect_init (bounds, + priv->clip.x - priv->allocated_size.x, priv->clip.y - priv->allocated_size.y, + priv->clip.width, priv->clip.height); } static gboolean -- 2.30.2